Revision: bazaar--devo--1.4--patch-18
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Fri Apr 15 07:09:05 BST 2005
Standard-date: 2005-04-15 06:09:05 GMT
Modified-files: libarch/apply-changeset.c libarch/diffs.c
    libarch/diffs.h libarch/make-changeset.c
    tests/test-merge.sh
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.4--patch-13
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-14
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-15
    thelove@canonical.com/bazaar--devo--1.4--patch-18
Summary: bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.
Keywords: 

Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-13
   merge thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-14
   add test for three way merging when tagging rules change

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-15
   bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.

